From 4a40933b1b58af0c0bc02f5c663df848130b4b94 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Mar 2002 22:53:22 +0000 Subject: [PATCH] Try to find libpng via pkg-config first, since libpng-1.2.2 will come with * configure.in: Try to find libpng via pkg-config first, since libpng-1.2.2 will come with a .pc file. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 43 ++++++++++++++++++++++++++----------------- 7 files changed, 56 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3084c0c6a8..6173f58f99 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-03-27 Matthias Clasen + + * configure.in: Try to find libpng via pkg-config first, + since libpng-1.2.2 will come with a .pc file. + Wed Mar 27 11:10:39 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_real_remove): Set diff --git a/configure.in b/configure.in index 6af38c1c4a..db2c09f26c 100644 --- a/configure.in +++ b/configure.in @@ -697,25 +697,34 @@ dnl Test for libjpeg dnl Test for libpng if test x$with_libpng != xno && test -z "$LIBPNG"; then - AC_CHECK_LIB(png, png_read_info, - [AC_CHECK_HEADER(png.h, - png_ok=yes, - png_ok=no)], - AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) - if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([#include ], - [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], - png_ok=yes, - png_ok=no) - AC_MSG_RESULT($png_ok) + AC_MSG_CHECKING(for libpng12) + if $PKG_CONFIG --exists libpng12 ; then + AC_MSG_RESULT(yes) + PNG='png' + PNG_DEP_CFLAGS_PACKAGES=libpng12 + LIBPNG=`$PKG_CONFIG --libs libpng12` + else + AC_MSG_RESULT(no) + AC_CHECK_LIB(png, png_read_info, + [AC_CHECK_HEADER(png.h, + png_ok=yes, + png_ok=no)], + AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) if test "$png_ok" = yes; then - PNG='png'; LIBPNG='-lpng -lz' + AC_MSG_CHECKING([for png_structp in png.h]) + AC_TRY_COMPILE([#include ], + [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], + png_ok=yes, + png_ok=no) + AC_MSG_RESULT($png_ok) + if test "$png_ok" = yes; then + PNG='png'; LIBPNG='-lpng -lz' + else + AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***) + fi else - AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***) + AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***) fi - else - AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***) fi fi @@ -846,7 +855,7 @@ GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0" GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB" GDK_PIXBUF_EXTRA_CFLAGS= GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" +GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" AC_SUBST(GDK_PIXBUF_PACKAGES) AC_SUBST(GDK_PIXBUF_EXTRA_LIBS) -- 2.30.2